Merge "Fix Eclipse errors"