Fixing some compilation issues [ci skip]