Version and dependency updates

After issues with pulling from the latest EAK master I've made changes
to improve the stability of dependencies and ensure we have a working
version available.