Changes for appeasing UIAppearance