Happy that it helped you.
PS : Have you tried XC compilers ? It produces code with better optimization..
Yes, I have and I actually quite like it.
I would have used it as setting the code offset is really easy in XC8, it's just I didn't want to have to re-write the whole project.