Fix style bugs and others