Fixes and stuff...

Wait for the changes in core to be merged first.