Fix all opt

Resolves outstanding issues