Fixes for web-stack, partially temporary