Reverted fastopt->opt update as it seemed to break things. Need to investigate further.