More message size hackery