More OctoKat changes