Shrine fixes