Some late tweaks