Prepare to update

Small fixes