Various fixes
additional fix