fixes to compile with new zdk version