Some fix to make installation work