Make shit consistent