Module system fixes