ticket:14 Fixed small code issues