Trying to fix problems from merging...