Resolve basic framework issues