Fix acknowledgements and error messages