Build issues and dependencies fixed