Fix an issue with scroll handling and with blocks overflowing.