Bug fixes for system settings functionality