Bug fixes, and missing bits