Minor task tweaks