some fixes to ensure a cleaner compile