Resolving some issues