Fixing Compilation Issues