Additional cleanup and a bug fix for the new inv code
Merge branch '1.6-MC1.5-Compat' into 1.6