Fixin bugs introduced during the merge