Some fixes for quest Black Swan (351) by @jurchiks