Broken issues fixed