Small Some small cleanups and fixes here and there