Bug fixes from tickets on GH.