Merge "Minor fixes to freeform workspace"