Fixes for store publishing