more small fixes...