Fixing bugs discovered on distribution 0.0.2 package.
Merge branch 'hotfix/distribute_fixes'