Fix a few extra things so that it runs on pion