Updates to use STI build