Changes to fix execution problems