small fixes, proper dependencies