Minor compilation issues