More fixes by Flaminsarge