Tiny fixes,