GPU and CPU Hikari fix