Ugly fixes for examiniation.