more base fixes