Fixing warnings and project cleanup