Grabbing source project's fixes