Tiny fixes according to comments