Some Athame fixes