Two minor fixes from Macbook air changes