Fix return from non void function.
Fix build for mirall target.