Abandoned Souls: Small optimization fixes

Small optimization fixes