Fix Compilation Issues