Tiny clean ups and fixes