Fixed Some Optional issues