Minor fixes in GP framework