Fixes for validating machines, running tasks