Fixing some lint issues and CS