[IMPROVEMENT] Some minor fixes