Fix modules and placeholders