Cleanup warnings with r30824