build & dep fixes