Lang + Block Fixes