Fixed issues;