Small conditions fixes