Monday morning bugfixes