Fix issues. Clean.