Fix a few minor OOPs