Fixing even more ward jumps and compile errors

:dancer: