Fixing some type/write-o's