Swing fixes