Fix assertion errors

Code Reviewer: Crisjaira Villarino

Issue: None