Fixes to pass the check