More small fixes
little changes