Some minor problems fixed