fixes for new settings