fixes for 3.4.1 and shovel stuff