SOme fixes for BLX