Bug fixes and namespace pollution fixes (v0.4.3)