Fix some warnings
new dialog code, dialog 4 beginning