Some small changes and error fixes