fixes to standalone