Fix merge issues that were in testing...