serrano: Fix user build issues

Change-Id: If77a173ef4cba92cd0b04ca5a6964310126d38f9