Sever fixes