Fixes of newly introduced bugs.