Fixed optional-ish issues