Fixed errors with noImplicitAny