Remove blind unwrap calls from content_directory.
Fix compiler warnings.