Fixing up style bugs