Fixed some issues with Context and static method vs instance method calls.