Small error fixes