Resolving some errors