Fix warnings and unmerged stuff