Concerning #618, squashing some warnings