Assessment fixes