Fixes for Roy