Some options fixed