OPT Minor fixes