Various changes
Fixed merge issues