Clean up warnings and such