Item fixes

No more build errors... now what ?