Fix dev dependencies & fix build image