Build fix

Second build fix for bug 2108. I took the liberty of merging 0.33 into master as well.