Fixing Compile Errors introduced in last commit