more lint compatible changes