Minor follow-up bug fixes