Fix problems so i can continue working on PTC-66