some changes need to get a running build since RAF is back :)