Partial fix of issues.