Addendum to 2923d91

- Fixed many incompatiblites and crashes in the climb bug patch