Few bug fixes
Version 2.7.2