Clean up warnings with latest master (aaf5574)