Fixes for building with gtk3