More fixes for uPy