Crucial fixes, I hope.