Add some missing blocks

Closes GH-86, GH-87, GH-85