Fixes comparison bug in GP and Residence
Fixes missing inclusion in maven