Fixed issues (sigh)