Add some fixed issues