Trivial fixes + Version control