Fix style bugs introduced by previous version