Small fixes
more small fixes