Fixes from jbuck