Fix uniform-initialization ambiguity issues