Minor fixed in ORASSBuilder and cleanup