some 0.9.4 helper fixes (more coming soon)