Let things pull their own container
Fixes for exit codes