Updated: Smaller package fixes to conform to standard.