Fixes before going live