Options issue fixes