Update 1.1.721 - minor bugfixes + performance tweaks

This is a small update taking care of few smaller issues we found as well as tweaking performance a bit.