Fix Adapter Issues