Minor changes for missing modules