[11/06/18] Bug fixes from previous update