a few more small fixes