Bug fixes from previous push