more crush fixes

Didn't fully implement the new set calls <facepalm>