Fix some Logic's/Blocks