More cleanups & fixes