Final (really?!) small fixes before going live