Final update for 0.13 compatibility (I hope)