Fix packaging & harbour compatibility