Fixing merge problems
Probably fixed post merge problems.