Gramma fixes