Fixing master - just a couple of missing imports

I guess I owe a round :)