Fixed up a few things to ensure we can come back from SBundle