Minor bug fixes
executionStrategy.Both (server+local execution) improvements.