more fixes

Signed-off-by: Rajat Gupta <rgupta@qubole.com>