block bug fixes