make fixes portable