Minor cleanup of print statements and warnings.