Minor Serverside parsing updates