Fix coding issues
Fix more teenyweeny coding issues