Moar bugfixes?