More fixes -- should be good to go now