Updated some block stuff to 1.8

And some more temporary fixes.