Latest changes after moving to vserver