Fixed previous issues.