Some fixes related to grapelli