Added pointer to the current version
Fix build failure
Fix warnings