Final bugfixes for quarter