Fix issues with package (Ref #12)