some changes to help building for grouper