Merge "Fix mixed code/declarations compiler warnings/errors"