Fixed minor problems