fixes from expo errors