Couple fixes for gtk3 version