Cleaned up the way patches gets applied