Revert user files and fix some compiler warnings