Fix some errors related to disabling modules - #890