Fixes and changes to allow for packaging of v0.3