OPT Minor modifications