Functional fixes
Version 1.2