Fixes for mockbuild container