Fixes for column store and one library change