Some tiny fixes #2