fixed broken build by adding needed optionals unwrapping for 8.1

Hello,

I just some needed unwrapping on the optionals that are now required when building with 8.1. No other changes were made.

-jeff