What to do about (Br)Olaf?

I miss seeing him around, I believe Olaf needs to be changed somewhat as he is very sink or swim at the moment. Anyone have any ideas on the matter to make him more consistent / less oppressive?

Bring back the Brolaf!