Fixes failing builder namespace spec and partially addressed #3