Fix some warnings...