Bug fixes 7-24-13