Misc tweaks; back to DBIx::Connector