Item Setting Fixes