Updates and fixes
After merge commit