Minor tweaks to remove warnings