Some bug fixes of the last release