misc lint fixes