Fix double closing just about everything