Fixes before delivery