Fixed all unresolved issues.