Minor tweaks
Solving merge issues