Update

Some fixes.