Further porting to PIC32