some irrelevant fixes