Some updates for building