Fix Derps, add needed functions

Change-Id: I31a8f55da7cf0b8813e990d22a197215da8a73d4