#5: Various server task improvements