Fix error messages from compiler