More fixes to beta serving