More bugs squashed

There's still an issue with the CTA forwarder that needs to be fixed
eventually