Index: Tests/kstars_lite_ui/CMakeLists.txt
===================================================================
--- Tests/kstars_lite_ui/CMakeLists.txt
+++ Tests/kstars_lite_ui/CMakeLists.txt
@@ -14,7 +14,7 @@
 
 IF (INDI_FOUND)
     INCLUDE_DIRECTORIES(${INDI_INCLUDE_DIR})
-    TARGET_LINK_LIBRARIES(kstars_lite_ui_tests ${INDI_CLIENT_LIBRARIES} ${NOVA_LIBRARIES} z)
+    TARGET_LINK_LIBRARIES(kstars_lite_ui_tests ${INDI_CLIENT_QT_LIBRARIES} ${NOVA_LIBRARIES} z)
 ENDIF ()
 
 ADD_TEST(NAME KStarsLiteUiTests COMMAND ${CMAKE_CURRENT_BINARY_DIR}/kstars)
Index: kstars/kstarslite/dialogs/locationdialoglite.cpp
===================================================================
--- kstars/kstarslite/dialogs/locationdialoglite.cpp
+++ kstars/kstarslite/dialogs/locationdialoglite.cpp
@@ -300,7 +300,7 @@
         geo->setCountry(country);
         geo->setLat(lat);
         geo->setLong(lng);
-        geo->setTZ(TZ);
+        geo->setTZ0(TZ);
         geo->setTZRule(&KStarsData::Instance()->Rulebook[TZRule]);
 
         //If we are changing current location update it
Index: kstars/skycomponents/cometscomponent.cpp
===================================================================
--- kstars/skycomponents/cometscomponent.cpp
+++ kstars/skycomponents/cometscomponent.cpp
@@ -93,9 +93,7 @@
 {
     QString name, orbit_id, orbit_class, dimensions;
     bool neo;
-    int mJD;
     double q, e, dble_i, dble_w, dble_N, Tp, earth_moid;
-    long double JD;
     float M1, M2, K1, K2, diameter, albedo, rot_period, period;
 
     emitProgressText(i18n("Loading comets"));
@@ -139,7 +137,6 @@
         row_content  = cometParser.ReadNextRow();
         name         = row_content["full name"].toString();
         name         = name.trimmed();
-        mJD          = row_content["epoch_mjd"].toInt();
         q            = row_content["q"].toDouble();
         e            = row_content["e"].toDouble();
         dble_i       = row_content["i"].toDouble();
@@ -169,9 +166,7 @@
         K1          = row_content["H"].toFloat();
         K2          = row_content["G"].toFloat();
 
-        JD = static_cast<double>(mJD) + 2400000.5;
-
-        com = new KSComet(name, QString(), JD, q, e, dms(dble_i), dms(dble_w), dms(dble_N), Tp, M1, M2, K1, K2);
+        com = new KSComet(name, QString(), q, e, dms(dble_i), dms(dble_w), dms(dble_N), Tp, M1, M2, K1, K2);
         com->setOrbitID(orbit_id);
         com->setNEO(neo);
         com->setDiameter(diameter);
Index: kstars/skyobjects/kscomet.h
===================================================================
--- kstars/skyobjects/kscomet.h
+++ kstars/skyobjects/kscomet.h
@@ -58,7 +58,6 @@
      * Constructor.
      * @param s the name of the comet
      * @param image_file the filename for an image of the comet
-     * @param JD the Julian Day for the orbital elements
      * @param q the perihelion distance of the comet's orbit (AU)
      * @param e the eccentricity of the comet's orbit
      * @param i the inclination angle of the comet's orbit
@@ -70,7 +69,7 @@
      * @param K1 the comet total magnitude slope parameter
      * @param K2 the comet nuclear magnitude slope parameter
      */
-    KSComet(const QString &s, const QString &image_file, long double JD, double q, double e, dms i, dms w, dms N,
+    KSComet(const QString &s, const QString &image_file, double q, double e, dms i, dms w, dms N,
             double Tp, float M1, float M2, float K1, float K2);
 
     KSComet *clone() const override;
@@ -196,7 +195,6 @@
   private:
     void findMagnitude(const KSNumbers *) override;
 
-    long double JD { 0 };
     long double JDp { 0 };
     double q { 0 };
     double e { 0 };
Index: kstars/skyobjects/kscomet.cpp
===================================================================
--- kstars/skyobjects/kscomet.cpp
+++ kstars/skyobjects/kscomet.cpp
@@ -50,9 +50,9 @@
 QMap<QChar, qint64> cometType;
 }
 
-KSComet::KSComet(const QString &_s, const QString &imfile, long double _JD, double _q, double _e, dms _i, dms _w,
+KSComet::KSComet(const QString &_s, const QString &imfile, double _q, double _e, dms _i, dms _w,
                  dms _Node, double Tp, float _M1, float _M2, float _K1, float _K2)
-    : KSPlanetBase(_s, imfile), JD(_JD), q(_q), e(_e), M1(_M1), M2(_M2), K1(_K1), K2(_K2), i(_i), w(_w), N(_Node)
+    : KSPlanetBase(_s, imfile), q(_q), e(_e), M1(_M1), M2(_M2), K1(_K1), K2(_K2), i(_i), w(_w), N(_Node)
 {
     setType(SkyObject::COMET);