General Fixes
Added missing files