Fix several style problems