manifest and error handling fixes