Fixes for preferences