More hardware accelerated fixes...