diff --git a/.hgignore b/.hgignore
index c27dbffe..3d5ce23a 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,25 +1,34 @@
-Mitsuba.app
+^Mitsuba.app/.*$
+.*\.obj$
 .*\.os$
 .*\.pyc$
 .*\.o$
+.*\.exe$
+.*\.manifest$
+.*\.exp$
+.*\.dylib$
 .*ui_.*\.h$
 .*moc_.*\.cc$
 .*qrc_.*\.cc$
-.*\.dylib$
-\.DS_Store
-sconf_temp
-mitsuba
-mtsgui
-mtssrv
-mtsimport
-.*\.exe
-config.py
-config.log
-.sconsign.dblite
-src/utils/addimages
-src/utils/createvol
-src/utils/dumpimage
-src/utils/joinrgb
-src/utils/ssalbedo
-src/utils/ttest
-src/utils/utils_test
+.*/\.DS_Store^
+^\.sconf_temp/.*$
+^config.py$
+^config.log$
+^.sconsign.dblite$
+^src/utils/addimages$
+^src/utils/createvol$
+^src/utils/dumpimage$
+^src/utils/joinrgb$
+^src/utils/ssalbedo$
+^src/utils/ttest$
+^src/utils/utils_test$
+^dist/.*$
+^mitsuba$
+^mtssrv$
+^mtsgui$
+^mtsimport$
+^src/.*\.lib$
+^src/.*\.dll$
+^plugins/.*\.lib$
+^plugins/.*\.dll$
+tools/windows/mitsuba_res.res
diff --git a/src/qtgui/glwidget.cpp b/src/qtgui/glwidget.cpp
index 44e86150..ec9f72ca 100644
--- a/src/qtgui/glwidget.cpp
+++ b/src/qtgui/glwidget.cpp
@@ -761,7 +761,7 @@ void GLWidget::paintGL() {
 			Float logLuminance, maxLuminance, unused;
 			m_luminanceBuffer[target]->getPixel(0, 0).toLinearRGB(logLuminance, maxLuminance, unused);
 			logLuminance = std::exp(logLuminance / (size.x*size.y));
-			if (std::isnan(logLuminance) || std::isinf(logLuminance)) {
+			if (ubi_isnan(logLuminance) || std::isinf(logLuminance)) {
 				SLog(EWarn, "Could not determine the average log-luminance, since the image contains NaNs/infs/negative values");
 				logLuminance = 1;
 			}
diff --git a/src/qtgui/rendersettingsdlg.cpp b/src/qtgui/rendersettingsdlg.cpp
index a9c4ee7e..feb65d19 100644
--- a/src/qtgui/rendersettingsdlg.cpp
+++ b/src/qtgui/rendersettingsdlg.cpp
@@ -172,7 +172,7 @@ void RenderSettingsDialog::update() {
 		if (samplerProps.hasProperty("sampleCount"))
 			sampleCount = samplerProps.getInteger("sampleCount");
 		else if (samplerProps.hasProperty("resolution"))
-			sampleCount = std::pow(samplerProps.getInteger("resolution"), 2);
+			sampleCount = (int) std::pow((Float) samplerProps.getInteger("resolution"), (Float) 2);
 	}
 	
 	m_integratorNode = m_model->updateClass(m_integratorNode,
@@ -208,7 +208,7 @@ void RenderSettingsDialog::update() {
 			if (treeItem->getName() == "sampleCount") {
 				treeItem->setValue(sampleCount);
 			} else if (treeItem->getName() == "resolution") {
-				treeItem->setValue((int) std::sqrt(sampleCount));
+				treeItem->setValue((int) std::sqrt((Float) sampleCount));
 			}
 		}
 	}