Added Ibon's fixes of build 55