Style fixes
Changes after building against Shark.