Merge "Return correct values and types"