matching iOS style fixes