v10: Resolving some issues