Fix for non-blocks in setupBlockProperties.