Edits around lock and unlock params, etc.