Fix Android Version related issues