SeFixed minor bugs