fix some inconsistances that break travis tests