Small fixes
Other small fixes