Fixed make and py compatibility