Updated to latest 1.6.2 and Fixed issues