Fixes for Adapter children, security exception race condition