minor fixes, hopefully none clashed