Fixed some problems with prefernces.
Merge