Fix some build errors with GTK3

Shell is still a bit unusable with GTK3