Small micro tiny fixes