Core/Scripting: A couple fixes for shattered Halls