Yay, bugfixes!