Address some of the issues in #493