Minor fixes: Settings and Places

Nothing too important, just a few bugs that are killed now