more fixes for zpu