Fixed some typescript warnings