Add fixes for BlockGlass