fixed build and class dependencies