Various post jam fixes