Fixes to ensure actually runs