Fixes to work correctly on Rakudo