Tuesday bugfixes