Fixed imports for "contents-based" apps