Fix patch mistakes