Further error fixes