Added my fixes