Fixing duplicate default constructor (happened after merge)
Fixing a couple of signed/unsigned mismatch warnings