Fixes and block bettersprinting