Closing some more issues