Small tweaks so that we can support iOS devices
Clean up fair selector a bit