Small fixes

Just some tiny fixes