Hard fixes