Warning removal, patches from Camille 019