Cleanups & corrections