Bugs and bad rename errors