Fix issues + upgrade to v 1.3