Some style bugs fixed