Some potential issue fixes