Some tiny fixes