More changes per discussions on bop-devel