Fixed second issues