Micro bug fixes