fixes to get it to run again on Catalyst 13