Smarter viking, fixes