fixes for zpu