Fix derps and make necessary modifications

Change-Id: I3a26fd307688734651cea41075b082663aab09c2