Fix: containers should work

A few small changes which get containers running agin.

/cc @jmyounker