Merge "Fix various type and reference issues"