Some make stuff changed + other clean up