Fixed NullPointerExceptions for getCanonicalName() calls
Fixed a lot of the item based properties not working at all
Merge branch 'PreRelease'

* PreRelease:
  Fixed a lot of the item based properties not working at all