Fixes by OliverG96