More metadata fixes.
Merge pull request #155 from mhaskel/1.1.4-prep

More metadata fixes.