Removed final from more declarations related to options