Minor module adjustments