Fixed some errors in the carrier plugin