Revise functions according to the OS change.
Fix the scrollbar bug