Bugfixes (timing rollover, solid block)