Fix bugs in RunBundle creation