Fix a few more issues