Fix harbour compliance