Resolved two minor unresolved issues.