Fix glitches and rebuild

Change-Id: I89a9841c3cc06f2b794be7b23bc75dc66fe94628