Fixes for Z30