Fixed more issuses