Bug fixes, and names