Fixed last two issues