More opt fixes, still broken