Fixed failures that occured after merging