Fixes import and packaging issues