Small Fixes And Build Push