Some fixes to destiny