So many small fixes...

May cleanup the updates list in the future.