v9: Resolving some errors