Some updates
Prior to build