Early morning commit of bugfixes