Some Cleanups and Fixes