Minor changes to swing interface