- General fixes to suit bundle