Fixing phase 2 bugs - 1