Merge "Fix up code warning and errors"