fixed issues with sandbox inconsistencies