Bug fixes from the redesign