Possible empty check
Merge fixes