Merge "Fix annotation / debugging"