Clean up warnings for 1.3.0