More fixes added related with optionals