Small corner case modifications