Some small bug fixes in module handling