Hi Jake,
The fixes for both of these issues are now on the OSVVM Dev branch. If you are allowed to fetch OSVVM from GitHub you can get the dev branch by doing:
git clone --recursive --branch dev https://github.com/osvvm/OsvvmLibraries
Otherwise let me know and I can push it to main and do a release to osvvm.org.
Jim