Fixed issues report by ChJohn