Fixed last couple errors