Fix a few more compilation issues