Minor changes, got to work on majsrv1