Some gramma fixes