fixing some compilation issues