Minor item fixes, old code shouldn't break anything tho.