Small fixes
More small fixes