Some small error fixes ;)