A few minor hitfixes