Initial Block/Item fixes for 1.7.2