Workaround a few nits in formatting