Moer black on black derp fixes

Change-Id: I321dee20024bb6960f1dae4e2267393239ecfa38