GP: Little fixes.