bug fixes to allow no inconsistencies from randomiser