Minor fixes
More small fixes