Local adapter fixes
Merge pull request #213 from GrahamCampbell/local

Local Adapter Fixes