Minor modifications from package review.  They were due to linkage issues