Fixes for Beta YARN