Adopt minor changes from GF branch