Fix small style bugs