Fix warnings, typos