Fixes from Jordan's computer