Add fixes before final submission