Fixed broken issues