Fixed some errors that were getting generated.