More fixes since I pulled from develop.