some changes for appcompat-v21