Fixes for !g