Fix major inconsistencies. Should've caught this earlier