Make the context drawer work again
This also removes some pretty spammy (and consequently annoying) warnings