extra/swt fixes