Oxygen & Arial fixes