small fixes and the like