Some minor fixes. This update is horrific :(