Fixed minor bugs
Fixed minor bugs