Bug fixes, deleted temps