Few fixes for bugs i saw with production data