A couple of modifications just before hosting on the server