Clean ups and fixes