Updates and fixes