Fix conditionals

Signed-off-by: Harshavardhana <harsha@hyperbotics.com>