Some more copiler warnings/errors fixes