Removed several warnings (several still persist)

GPTM is main contributor to warnings now.