Fixes for dev layers on scrolling