Some fixes

1.5hr