Fixed some more weird code