Fix some 1.9.3 stuff