Fix the last bug
Define fixes
Minor fixes