Fixing delivery bugs