New RAF, fix build problems