bug fixes for v0.3 testing