Last round fixes for when sword is null