Missing imports

Sorry Vekexasia,

I missed some imports.

Yes, it has been tested :smile: 

There is a fix for the known 'SPAN_EXCLUSIVE_EXCLUSIVE spans cannot have a zero length' error seen in logcat, I will try make some time soon to commit it too.