Fix style bugs