Resolved some issues