Fixed patches preventing includes / libs installing correctly