Minor opta chnages