Crash fixes, optimizations to settings listening.