Clean-up warnings