some tiny fixes