Small changes to client node serverr