Fixes

Some stability fixes.