Multiple fixes in webapp