Compiled changes from fix