Port 1.6.4 compat stuff to 1.7