Fixes to siddhi