Cleanup some warnings and mem leaks