Fix jump blocks and make use less resources