Clean layout errors.

Also clean test errors for removing write permissions.