Cleanups & fixes