use beaker with various un-PRed fixes