Fixed a couple of issue during the build #15