fixed some leftover bugs in on serverside