Update configurations and fix minor bugs