minor: some forgotten changes that should be included in the previous commit