some hacks to allow the use of class server uri + other fixes