quicklizard99 [#39] Fix yet more problems