fixes due to client updates