Implementing fixes from 2013-09-24 (changed courier label)