Merge: src: reduce warnings and spelling errors