oops: Fix a few small issues