Fix issues with nilable blocks