Resolved some fixes.