Some tweaking on Marlin config