addressing build errors due to optionals.