Some *others* fixes