Fixes on delivery