Many fixes at frontend and server side