Minor edits to common blocks