Current bgu fixes