Some small fixes to this, hotfixes, basically