Fixed inconsistencies between different versions of app