Minor tweaks to get rid of warnings