Bill fixes