Fix a few one-off issues