general small fixes