Bug fixes from the lab
Commit