Compiler indicated cleanups to Fix #105