Small cleanups & fixes