Some accommodations to ease development