Fixed compilation issues that snuck into the last commit