Fixed minor problems here and there