Fix up warnings