falcon : Fixes

Change-Id: Id88c9a614734d4d80100a57b92ca4ce5b79fd6d9