some small fixes.