Fixed couple errors