Fixing bugs after conflicts with merge of Justin's commits