Minor cleanups & fixes