Even more fixes for the imprint