3579 late tweaks