Some issue fixes