Cleanup, fix compiler warnings