Minor edits to fix broken build