Update to latest NesiRujban's fixes