Fixes on default None value