More fixes for previous commits