callback registration fixes, dependencies fixed