Fix builds

[fraune]

• Unsafely unwrap optionals to get builds to run again. This is no better than the original code, but should be returned to for safety.

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}