Fixes for build with QuickSettings