Small fixes to get independent module to run