Fiexed minor problems