Fix a few more compilation bugs...