Execution fixes

Some minor fixes.
scaladoc?