ticket: 8 Some issues fixed