base: compilation fixes

Change-Id: If298bd8aa6e256b7355110742fa672a83d802c43