fixes in base settings