Some fixes and dep regulation