lint: address various issues