Tweaks to remove warnings.