And even more silly bug fixes