Minor import cleanups and add missing { from if statements