few more small fixes