Tuna: Fix build errors

Change-Id: I37765751eb7cfe9325a74298d8c541f7855a0a47