Fixed trivial compilation errors in the last commit...