Last bug fixes of the night