Updated fixed issues