diff --git a/src_main/concurrent/piconditionvar.h b/src_main/concurrent/piconditionvar.h
index a506b8c6..a6337f31 100644
--- a/src_main/concurrent/piconditionvar.h
+++ b/src_main/concurrent/piconditionvar.h
@@ -15,7 +15,7 @@
 class PIP_EXPORT PIConditionVariable {
 public:
 	explicit PIConditionVariable();
-	~PIConditionVariable();
+	virtual ~PIConditionVariable();
 
 	/**
 	 * @brief Unblocks one of the threads currently waiting for this condition. If no threads are waiting, the function
diff --git a/src_main/math/pimathcomplex.h b/src_main/math/pimathcomplex.h
index 28d78ca3..dcfaf1c9 100644
--- a/src_main/math/pimathcomplex.h
+++ b/src_main/math/pimathcomplex.h
@@ -67,14 +67,13 @@ inline complexd sign(const complexd & x) {return complexd(sign(x.real()), sign(x
 
 inline complexd round(const complexd & c) {return complexd(piRound<double>(c.real()), piRound<double>(c.imag()));}
 inline complexd floor(const complexd & c) {return complexd(floor(c.real()), floor(c.imag()));}
-inline complexd ceil(const complexd & c) {return complexd(ceil(c.real()), ceil(c.imag()));}
-
+inline complexd ceil (const complexd & c) {return complexd(ceil(c.real()), ceil(c.imag()));}
 #ifdef PIP_CXX11_SUPPORT
 #  define acosc acos
 #  define asinc asin
 #  define atanc atan
 #else
-inline complexd atanc(const complexd & c) {return -complexd(-0.5, 1.) * log((complexd_1 + complexd_i * c) / (complexd_1 - complexd_i * c));}
+inline complexd atanc(const complexd & c) {return complexd(0., 0.5) * log((complexd_1 - complexd_i * c) / (complexd_1 + complexd_i * c));}
 inline complexd asinc(const complexd & c) {return -complexd_i * log(complexd_i * c + sqrt(complexd_1 - c * c));}
 inline complexd acosc(const complexd & c) {return -complexd_i * log(c + complexd_i * sqrt(complexd_1 - c * c));}
 #endif