Fixing more weird issues