More fixes/hacks for b2evolution 5