Fixes to web code and dependencies