fixes for storage writer and errors with linq