Corrected minor (but fatal) mistakes