Fixed some issues with optionals.
fixed optional issues.