Cleanup two warnings