Fix some bad business in assessment code