fix broken build by adding needed optionals unwrapping for 8.1