Fixed a few things

..but probably broke a few others.