latest scroll view fixes (daniel + boris)