More clean-up; some warnings