falcon : Fixes

Change-Id: If4f8401fc65d4e88617a2d8b693e6c89f0a8096d