random tiny fixes