Cleanups and Fixes