Base: Fix derps

Change-Id: I58bec1f084804f57a96b307a873ef53ba2c6add5