Fixed issues problems