Fixed errors with execution context