fixes for old api