More bug fixes. The last commit?