Hack in some more stuff