Fix for show configured modules only + fix build