additional bug fixes for v0.3