Genesis box fixes