Improve some warnings.
Fix SS. Reported by Wydra Dennis.