Fixes and more custom block support