Merge "Fixing minor build errors"