BunnyMark fixes