Improved builder / runner command handling