Fixed issues....