Some updates, needed for build