Added some tiny fixes