Upgrade to first-mate 2.0.4