Fixes on close_black