Fix typo
Clean up problems