Fixed modules to correct kernel errors