Bug fixes - Friday's Testing