Misc fixes of the day