More block bug fixes. Fixes #58... again