Fixed bugs created by yesterdays bug fix