Fixed more weird issues