Fixed issues...