some bug fixes (#4818)