Fixes on 8.