Fixes

Fixes for AT stuff, to keep from breaking library loader, too.