More small fixes
More small fixes