more stray fixes