Additional fixes - first round of testing