Fix minor bugs on Lance