#515 style fixes