Various edits to fix block errors