Fixed some issues
Merge fixes in U3