Fix broken compile and test.