Build order fix and dep update.

[gjcope]

• Fixed long standing build order issue where you had to build twice
• Updating dependencies to resolve security issues