Core: Many fixes
Core: Many fixes