More fixes after testing