Fixed minor bugs in GuestModuleStateContainer
Closes #114
Closes #115