DO NOT MERGE: Test compile fix hacks