Options issues resolved