Remove a couple more compile warnings.

Change-Id: Ifc4cf74fa9ba87cac92783f67abfaf5171477e6f
Revert back to make tests work, don't need the -1

Change-Id: I7d827765fbe1123d1aefd9c1480f63abf875100c
Merge topic 'implement_new_fragment_analysis' into next

2964c72 Revert back to make tests work, don't need the -1
50517d4 Remove a couple more compile warnings.