Some more changes that should remove the errors