Fix bugs/feedback from :gaye.